Skip to content

memory(fork-audit): R/C/T diff-filter coverage + plumbing-vs-porcelain note + slot-semantics on MEMORY.md HTML comment (Amara round-10)#827

Merged
AceHack merged 2 commits intomainfrom
memory/fork-audit-rename-copy-coverage-amara-2026-04-29
Apr 29, 2026
Merged

memory(fork-audit): R/C/T diff-filter coverage + plumbing-vs-porcelain note + slot-semantics on MEMORY.md HTML comment (Amara round-10)#827
AceHack merged 2 commits intomainfrom
memory/fork-audit-rename-copy-coverage-amara-2026-04-29

Conversation

@AceHack
Copy link
Copy Markdown
Member

@AceHack AceHack commented Apr 29, 2026

Summary

Three Amara round-10 corrections to the now-merged hard-reset safety addendum (PR #826):

  1. Audit was missing rename/copy/type-change coverage. The slogan "same path is not same substrate" has an inverse: "different path can still be same substrate." Renames/copies need content comparison, not path equality. Replaced --diff-filter=A + --diff-filter=M with comprehensive --diff-filter=ACMRT --find-renames + per-status interpretation guide.

  2. Plumbing-vs-porcelain note added. Human audit is fine with git diff; scripted tooling should prefer git diff-tree -r --name-status --find-renames (plumbing) for output stability + config-immunity, OR add -c core.quotepath=false --no-ext-diff to porcelain for predictability.

  3. MEMORY.md HTML comment slot-semantics made explicit. The comment was acting as a single-slot ledger and silently overwriting prior markers. Renamed paired-edit:latest-paired-edit: with explicit slot-semantics note.

Best round-10 keepers

Added files are a clue.
Modified shared files are the trap.
Content equivalence is the gate.
Same path is not same substrate.
Different path can still be same substrate.

Skipped per B-0105 consolidation gate (deferred to consolidation pass)

  • "Paired-edit failure must stop before commit" — process discipline; will absorb into existing paired-edit lint documentation.
  • "Safety blockers should land as soon as green" — discipline-level rule; honored in this PR's intent (small follow-up, not new conceptual island).

Test plan

  • Verbatim Amara quotes preserved in commit body
  • Existing memory file edited (no new conceptual island per B-0105)
  • MEMORY.md paired-edit comment updated with explicit slot-semantics

🤖 Generated with Claude Code

…n note + slot-semantics on MEMORY.md HTML comment (Amara round-10)

Three corrections from Amara round-10 review of PR #826
(now-merged fork-topology safety addendum):

1. Audit was missing rename/copy/type-change coverage. The
   slogan "same path is not same substrate" has an inverse:
   "different path can still be same substrate." Renames and
   copies need content comparison, not path equality.
   Replaced `--diff-filter=A` + `--diff-filter=M` with a
   single comprehensive `--diff-filter=ACMRT --find-renames`
   call + per-status interpretation guide.

2. Plumbing-vs-porcelain note added: human audit is fine with
   `git diff`; scripted tooling should prefer
   `git diff-tree -r --name-status --find-renames` (plumbing)
   for output stability + config-immunity, OR add
   `-c core.quotepath=false --no-ext-diff` to porcelain for
   predictability.

3. MEMORY.md HTML comment renamed `paired-edit:` →
   `latest-paired-edit:` per Amara: the comment is acting as
   a single-slot ledger that loses prior markers each time;
   making the slot semantics explicit prevents future
   confusion that only one paired edit exists. (The prior
   round-9 marker was overwritten without ledger preservation
   — a chronic drift class. Future enhancement: paired-edit
   log file if multi-slot history becomes necessary.)

Round-10 keepers preserved in audit prose:
  Added files are a clue.
  Modified shared files are the trap.
  Content equivalence is the gate.

The four meta-rules from the round-10 packet that are NOT
landing as new substrate (per B-0105 consolidation gate):
  - "Paired-edit failure must stop before commit" — process
    discipline; will absorb into existing paired-edit lint
    documentation when consolidation pass picks it up.
  - "Safety blockers should land as soon as green" —
    discipline-level rule; honored in this PR's intent.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings April 29, 2026 07:51
@AceHack AceHack enabled auto-merge (squash) April 29, 2026 07:52
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 599fd10807

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the hard-reset/content-equivalence audit guidance for the AceHack→LFG fork topology memory, expanding it to better detect divergence beyond simple add/modify cases and clarifying how the MEMORY index’s paired-edit marker is intended to behave.

Changes:

  • Expand the content-equivalence audit recipe to cover rename/copy/type-change categories via diff-filter guidance and rename detection.
  • Add a note distinguishing human-friendly git diff usage from scripted-tooling preferences (plumbing vs porcelain).
  • Clarify memory/MEMORY.md HTML comment semantics as a single “latest paired edit” slot.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
memory/feedback_lfg_master_acehack_zero_divergence_fork_double_hop_aaron_2026_04_27.md Improves the hard-reset safety addendum’s audit commands and adds tooling/interpretation notes.
memory/MEMORY.md Updates the top-of-file marker comment to explicitly represent a single latest-entry slot.

…te pass + CI cost note (Amara round-11)

Three corrections to PR #827's fork-audit additions:

1. --diff-filter=ACMRT requires BOTH --find-renames AND
   --find-copies. Previous form had `C` in the filter but only
   enabled rename detection, so copied entries would never
   appear. Added --find-copies. Plumbing form likewise uses
   `-M -C`.

2. D=deleted moved to a SEPARATE pass. Not AceHack-content-
   loss in the AceHack→LFG hard-reset direction (LFG already
   lacks the file), but can be SEMANTIC REGRESSION if AceHack
   intentionally removed bad/stale/unsafe content. Review
   separately when the deleted path is workflow / security
   config / tooling / governance substrate.

3. Copy-detection cost note for CI tooling. -C has an O(n²)
   fallback comparing each added file to each deleted file.
   Added two-pass tooling pattern:
     fast pass — A/M/R/T with rename detection only
     slow pass — bounded -C (e.g. -l200) for suspicious clusters
   Human one-shot audit can stay unbounded.

Best round-11 keeper:
  Renames need -M.
  Copies need -C.
  Deletes need judgment.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@AceHack
Copy link
Copy Markdown
Member Author

AceHack commented Apr 29, 2026

Round-11 already addressed all 3 outdated threads (commits landed prior to current HEAD):

  • Enable copy detection in audit command--find-copies added alongside --find-renames. Audit command now: git diff --name-status --find-renames --find-copies --diff-filter=ACMRT origin/main..acehack/main.
  • --find-renames does not enable copied-file detection — same fix; both flags now present.
  • Inline code span broken across newline — reformatted as fenced code block; markdown renders correctly now.

Resolving all 3.

@AceHack AceHack merged commit 43ac770 into main Apr 29, 2026
23 checks passed
@AceHack AceHack deleted the memory/fork-audit-rename-copy-coverage-amara-2026-04-29 branch April 29, 2026 08:15
AceHack added a commit that referenced this pull request Apr 29, 2026
…ad cleanup on #825/#827 (#828)

Picked up post-compaction at the unstaged round-12 diff-parser rewrite
on tools/lint/no-directives-otto-prose.sh; landed it as commit b30d5d0
on the #825 PR head, with tests.md framing additions ("Test-input vs
authorial register" carve-out + 2 missing fixtures for renamed-file
violation + filename-contains-human-but-clean-content). Posted round-12
resolution summary on #825, marked all 12 unresolved threads resolved
(3 P0 + 5 P1 + 4 P2/outdated). Same pass on #827: 3 outdated threads
already addressed by round-11 fixes (--find-copies + multi-line code
reformat) marked resolved. Both PRs now BLOCKED+MERGEABLE+auto-merge-
armed+0-unresolved → tick-1 of waiting on CI on the new commit.
Cron 43c91583 confirmed alive.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants